3dfe1be9d64000d49de2d8943221ce19e4de6606,clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/ws/AddressManager.java,AddressManager,AssociateAddress,#AssociateAddressType#,381

Before Change


      LOG.debug( "Dispatching unassign message for: " + address );
      try {
        VmInstance oldVm = VmInstances.getInstance().lookup( address.getInstanceId() );
        AddressManager.unassignAddressFromVm( address, oldVm );
        AddressManager.tryAssignSystemAddress( oldVm );

        if( !EucalyptusProperties.disableNetworking ) {

After Change


      try {
        VmInstance oldVm = VmInstances.getInstance().lookup( address.getInstanceId() );
        if( address.isAssigned( ) ) {
          AddressUtil.unassignAddressFromVm( address, oldVm );
        } else {
          AddressUtil.dispatchUnassignAddress( address, oldVm );
        }